From 6810eccff34528e784bbe4b2f44fcafd8eb0c9fb Mon Sep 17 00:00:00 2001 From: Boyuan Yang Date: Sat, 23 May 2020 10:46:25 -0400 Subject: [PATCH] debian/control: Use system libmarisa --- debian/changelog | 9 +++++++-- debian/control | 1 + debian/rules | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index aeab62d..8e0e605 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -opencc (1.1.1-1) unstable; urgency=medium +opencc (1.1.1-1~exp1) experimental; urgency=medium [ 肖盛文 ] * New upstream version 1.1.1 @@ -24,7 +24,12 @@ opencc (1.1.1-1) unstable; urgency=medium * delete unused patch: use-system-libraries.patch * d/watch: use @PACKAGE@ @ANY_VERSION@@ARCHIVE_EXT@ - -- Boyuan Yang Sat, 23 May 2020 10:41:31 -0400 + [ Boyuan Yang ] + * ds: Do not include bundled gtest and libmarisa. + * debian/rules: Explicitly disable building bundled libmarisa. + * debian/control: Add new build-dependency libmarisa-dev. + + -- Boyuan Yang Sat, 23 May 2020 10:45:53 -0400 opencc (1.1.1-1~exp1) unstable; urgency=medium diff --git a/debian/control b/debian/control index ed2533b..1bee22e 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Build-Depends: doxygen, graphviz, libjs-jquery, + libmarisa-dev, libtclap-dev, python3:any, rapidjson-dev, diff --git a/debian/rules b/debian/rules index 8054960..50e26c1 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,8 @@ override_dh_auto_configure: -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_DOCUMENTATION=ON + -DBUILD_DOCUMENTATION=ON \ + -DBUILD_BUNDLED_LIBMARISA=OFF execute_after_dh_auto_install: ln -sf /usr/share/javascript/jquery/jquery.js debian/tmp/usr/share/opencc/doc/html/jquery.js -- 2.30.2